Fix screwy indentation.

Wed Apr  5 00:08:36 2000  Owen Taylor  <otaylor@redhat.com>

	* gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy
	indentation.

	* Makefile.am (EXTRA_DIST): Fix typo.

	* gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk
	to catch gdkconfig.h

	* gtk/gtkitemfactory.c: Added FIXME.

diff --git a/ChangeLog b/ChangeLog
index 3ca38dc090f84aab66d8ee3cae50c311e97e7b2b..ae34dabf0d34b4dacae6d243938432e53d9d0325 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Wed Apr  5 00:08:36 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy
+       indentation.
+
+       * Makefile.am (EXTRA_DIST): Fix typo.
+
+       * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk
+       to catch gdkconfig.h
+
+       * gtk/gtkitemfactory.c: Added FIXME.
+
 2000-03-30  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_get_position): oops.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3ca38dc090f84aab66d8ee3cae50c311e97e7b2b..ae34dabf0d34b4dacae6d243938432e53d9d0325 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,15 @@
+Wed Apr  5 00:08:36 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy
+       indentation.
+
+       * Makefile.am (EXTRA_DIST): Fix typo.
+
+       * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk
+       to catch gdkconfig.h
+
+       * gtk/gtkitemfactory.c: Added FIXME.
+
 2000-03-30  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_get_position): oops.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3ca38dc090f84aab66d8ee3cae50c311e97e7b2b..ae34dabf0d34b4dacae6d243938432e53d9d0325 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,15 @@
+Wed Apr  5 00:08:36 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy
+       indentation.
+
+       * Makefile.am (EXTRA_DIST): Fix typo.
+
+       * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk
+       to catch gdkconfig.h
+
+       * gtk/gtkitemfactory.c: Added FIXME.
+
 2000-03-30  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_get_position): oops.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3ca38dc090f84aab66d8ee3cae50c311e97e7b2b..ae34dabf0d34b4dacae6d243938432e53d9d0325 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,15 @@
+Wed Apr  5 00:08:36 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy
+       indentation.
+
+       * Makefile.am (EXTRA_DIST): Fix typo.
+
+       * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk
+       to catch gdkconfig.h
+
+       * gtk/gtkitemfactory.c: Added FIXME.
+
 2000-03-30  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_get_position): oops.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3ca38dc090f84aab66d8ee3cae50c311e97e7b2b..ae34dabf0d34b4dacae6d243938432e53d9d0325 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,15 @@
+Wed Apr  5 00:08:36 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy
+       indentation.
+
+       * Makefile.am (EXTRA_DIST): Fix typo.
+
+       * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk
+       to catch gdkconfig.h
+
+       * gtk/gtkitemfactory.c: Added FIXME.
+
 2000-03-30  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_get_position): oops.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3ca38dc090f84aab66d8ee3cae50c311e97e7b2b..ae34dabf0d34b4dacae6d243938432e53d9d0325 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,15 @@
+Wed Apr  5 00:08:36 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy
+       indentation.
+
+       * Makefile.am (EXTRA_DIST): Fix typo.
+
+       * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk
+       to catch gdkconfig.h
+
+       * gtk/gtkitemfactory.c: Added FIXME.
+
 2000-03-30  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_get_position): oops.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3ca38dc090f84aab66d8ee3cae50c311e97e7b2b..ae34dabf0d34b4dacae6d243938432e53d9d0325 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,15 @@
+Wed Apr  5 00:08:36 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gdk/x11/gdkgc-x11.c (_gdk_x11_gc_new): Fix screwy
+       indentation.
+
+       * Makefile.am (EXTRA_DIST): Fix typo.
+
+       * gdk[/x11]/Makefile.am (INCLUDES): Add $(top_builddir)/gdk
+       to catch gdkconfig.h
+
+       * gtk/gtkitemfactory.c: Added FIXME.
+
 2000-03-30  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_get_position): oops.

diff --git a/Makefile.am b/Makefile.am
index 17e824748abf5f2f7e6825d5356d75ff3ccb481f..c27fb1f35516ecd3b1cfcee32068104df3e869e2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ EXTRA_DIST =  \
        examples/buttons/buttons.c  \
        examples/buttons/info.xpm  \
        examples/calendar/Makefile  \
-       examples/calendar/gcalendar.c  \
+       examples/calendar/calendar.c  \
        examples/clist/Makefile  \
        examples/clist/clist.c  \
        examples/entry/Makefile  \

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index b91ce20d1497d1fb9f2aa140cbf81121a7ce07d9..f189da3dfbd35d8c2ac0408631961462dd95feaa 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -11,6 +11,7 @@ EXTRA_DIST =  \
 INCLUDES = @STRIP_BEGIN@ \
        -DG_LOG_DOMAIN=\"Gdk\"  \
        -I$(top_srcdir)         \
+       -I$(top_builddir)/gdk   \
        @GTK_DEBUG_FLAGS@       \
        @GTK_XIM_FLAGS@         \
        @GTK_LOCALE_FLAGS@      \

diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am
index afa9db5f02af3b6e2215b4bd6ded3f42f7b80df0..a201cdb153b663de93489aa93568de67c422b1be 100644 (file)
--- a/gdk/x11/Makefile.am
+++ b/gdk/x11/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES = @STRIP_BEGIN@        \
        -DG_LOG_DOMAIN=\"Gdk\"  \
        -I$(top_srcdir)         \
        -I$(top_srcdir)/gdk     \
+       -I$(top_builddir)/gdk   \
        @GTK_DEBUG_FLAGS@       \
        @GTK_XIM_FLAGS@         \
        @GTK_LOCALE_FLAGS@      \

diff --git a/gdk/x11/gdkgc-x11.c b/gdk/x11/gdkgc-x11.c
index 10d2d092450c2f3e1c13af29da4d9ae1f0237afd..16deedc2153ff3e1f63e427954ebaa5ac5413c58 100644 (file)
--- a/gdk/x11/gdkgc-x11.c
+++ b/gdk/x11/gdkgc-x11.c
@@ -75,8 +75,8 @@ _gdk_x11_gc_new (GdkDrawable      *drawable,
   gdk_x11_gc_values_to_xvalues (values, values_mask, &xvalues, &xvalues_mask);
   
   data->xgc = XCreateGC (GDK_GC_XDISPLAY (gc),
-                                     GDK_DRAWABLE_XID (drawable),
-                                     xvalues_mask, &xvalues);
+                        GDK_DRAWABLE_XID (drawable),
+                        xvalues_mask, &xvalues);
 
   return gc;
 }

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index c47ee8d278d58a78100be11f21a5df4a4f47c630..82a849e17c0c499745d20e1f70d87684f98cf31f 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -953,6 +953,7 @@ gtk_item_factory_parse_path (GtkItemFactory *ifactory,
 
   *path = g_strdup (str);
 
+  /* FIXME: This does not handle __ correctly !!! */
   p = q = *path;
   while (*p)
     {